Really fixed #146 this time