moved fix-transitions stuff to an extend