This should fix #206