Bug fixed - Back and graph