suggested fix for #627