Fixing build - caused by class mismatch