Fixed before commit