fix #48 and fix #50