fix shit a bit