attempt to replicate #22