fix booleans issue