order bug fixing