Shortcut and bug fix