Fix for #3868

Fix for #3868