fix #154
fix #153
#123 test