Fixed C5 problem