Needs an additional check for array type