Merge "Fixing memory leak introduced in previous commit."