squashed bug that sneaked in during merge