Getting closer to starting point without the bug