Fixed Main hadnling of non interperter case