Bugs fix in shortcuts introduced by new version