This should resolve #39 this time