Wrap in array if needed

This seems very hacky, so I am okay finding a different solution, but it maintains the structure and passes all tests.

@bjsousa