removed a typo, made slightly more work approprite :(, fixed sublclassing problem