fix broken logic in r15272, r15273