Fix disarming blade trap as per issue #1403.