fix #33 and #34