Hopefully should fix #28