Follow up from #191
Follow up from #191