should fix #54