Fix bug with previous commit