Fix issue reported as part of #958