Follow up from #215
Follow up from #215