class tweaking for #384