Shortcuts - Fix for invalid numerical targets