Fixed another definiton order bug