Quick fix because of a stupid auto merge