Fix fix for Issue 4073

#4073