Fix: References pointing to the wrong thing