Satya - BugFixes

GST crash for company case