Solution references fixed