TESTED : Enhancement of Gigas

Fixes of bug from the non tested version