Fixed font switching issue