Fixed errors again