fix (squash with first)