Fix for Issue #2245 | Support multiple column indexes.

See issue #2245