Fix for #2489