[WIP] fix issue #37

I will fix #37.