Fix to #344