Fix delegation issue