Follow up from #118
Follow up from #118