Fixing removing a 'maybe' state