Switch behavior corrected