attempt to fix #12, #49 and #65