This commit should fix #1