Straight bug fix