Fix clearing from happening each time