Squashed all but one issue with unexpected PS1