Reference data bug-fix