fix #2 and #3