bool fix
merge