fix type pt1
fix type pt 2