closing issue 311