Follow-up from #354, #365
Follow-up from #354, #365