Follow up task from #86
Follow up task from #86