Fixed issue. This resolves #6354