Proper fix for Condition bug