Fix issue 331