fixing #11 and #12