fix fronted switching