Merging in Erik's fix for my conditional