fix bugs on 12.3