Bug Fix: Memory issues.