Part of switching bug is fixed.