Fixed rebased code