This should fix #4