Fix, squash with previous commit