fixed bug with shortcuts