Bug in re-ordering of companion form corrected