fix #16, #34