Fix for single condition