fixed delegation issue