Fix for #3155

resolves #3155