probably the issue in #49 and #54