fixed weirdness on line 30