fix #4, #5