fix #13 and #14