fixing Simon's shit