removed hack with main type