Fixing problem with diff resolution and quick start-stop.