A nice change fixes #1