quick fix for #6