This last change fixes #1

It's really fixed this time