(FINALLY) fix referencies