Fixing and close #33