something fixed, hoping it works