squashed fix