some fix #120