'return false' behavior fix