Fixed #18, using the old delegate pay way