fixed veri horible bug