first version of #32
fix #32