Small fix for non scalar types