DONE: func/procedure reference fixed