Merge sjinks/config-696-a

Check type of the very first key instead of checking whether the key 0 exists