in-class fixes