CIC-1004 & CIC-1005 fixed