Fixed Error03 and Error04