Fixed issue with edge case

Moving directly from right to left was causing an issue with check win
resolutions. Pulled out the special cases that were put in last time and
resolve them separately rather than merging the two together.