small change to support the correct class