fixed issue#23