make it can run in 2.3, fix #3, #4