Bug 1018836 - Fix immediate transition issues