Trying to fix this broken thing