Fixing memory leak bug ...