Fix delegate method, switch for action methods