Fix for potential static instance bug.