Trying to fix this mess