work on issue31 and #11