Fixed nasty little bug where we were not moving to the correct location when already in front of the same cabinet