before 6.3.2 finish