This should fix #51