type issues fixed