fix some problems #24