Attempting to fix boolean issue