Merge fixed (Now it is)