Address problems with issue 314