Attempt to fix this mess