Fixing problem with non-array expansion
Merge pull request #489 from spekary/bugfix-NonArrayExpansion

Fixing problem with non-array expansion