Shortcuts - self target fix