fixed issue with order of types
fixed issue with order of types