Can you fix and squash your pull request for this?