squashed last bug