Trying to replicate #22 in new version, no luck, will close when released