more fixing on my end