Memory issue found in master branch