fix eventual bug