improving #63 for more consitent guide mode behavior