fix bugs from 5.5