Fix bogue

Fixe the 19 bogues