fixed issue24