Fix in GUI