finally fix transition...