fix bugs in 8.4