fixing references
Merge