fixing diamond bug on return to legacy