Fixed order bug