fix #107, #106