applying correction from #219