Revert "Merge pull request #253 from corrupt952/master"

This reverts commit c3b001b78cad8f4c5aa34f39c344b85ecd8aaedf.

Reason: Calling flatten is only hidding the real issue. We should always
have a flat array