Fix ticket [ patches/147 ] code duplication.