Fix for boolean?