This should fix #115