Tim Bishop, fixes #475