Fix for issue 3327