quick fix for #558