CodeBase get fixed