fix #11 fix #14