quick fix for #2451