fixed boolean stuff