This should fix #3.