References should be resolved more robustly