Fix issue 326