Closed #35
It suppose to fix #43