v1.43

Fix bugs from to design pattern change.