memory bug fixed (temporary)