fix #2 and #4