Fixed array handling Fixes #8