Fixed #344