quick & dirrty fix for strange transition