fix for fast switching