Follow-up from #1236
Follow-up from #1236