fast switching bug fix