now works without unpack set to true