Implemented a reliable save detection mechanism

The solution was obvious but hey, I didn't see it!