morning commit
fixed boolean logic