Unsuccesful attempt to fix #212