Added global initialization which was  creating problems for us