Issue removed on Book load second time or when the location changes