Fix stupid circular dependency bug - sorry