Fixing shortcuts