Attempting to add fixes for true and false flags