Fix wrong behavior about return value of shortcut request