fixed and microbug :D