(partially) fix #139