Fix hanging conditional