fix #91 | trying to fix #95 unsuccessfully