(partially) fix #139 (again)