Fix repeating bug