william already fixed, I just move to helper Fixed #154