Fixing multi calls to references issue