Fixed occasional mistakes