Memory issue fix from janel