Attempts to fix (uses more memory now!)