Fixed while completion error