- fixed bug with shortcuts