Fix issue 329