Merge "Fix code error simulator"