fixed #11 and #12