Resolved CI problems