Removed redundant checks
fixed compatibility issue between corb1 and corb2