Update to fix issue with Exception in thread main