Another try at fixing #101
Now really fixed #101 by not trying to do anything fancy