GBC : Fixing a bug for completion