[BugFix] Fix wrong references