fixed and/or memory bug