Follow up from #54
Follow up from #54