Reverting fix