Bug fix
More gloating