This commit should fix #49