Overwriting fix