Close #68 and #11