Fix class again

Change-Id: I0336ceed90919f780cb6dc686246de45f60d4757