fix #116 without breaking anything