Fix #1137 - Handle cmd.bp