fixed boolean (with merged upstream)