Let's get rid of this check and overwrite automatically