Hopefully this should fix #51