Fixed transitions to work with partials