Possible fix for #2424