fix #138, #139