fixed shadowing of true and false