Duplicated code fix issue #88