Singleton Potential Leak Fix

This pull, fixes a potential leak that the analyzer shows.