This should fix #53