Fix for #3381.