Possible fix for boolean issues