fixed delegate issue