Attempt to fix shit