Bug Fixing on ICP