Fix — close #11 #12