Fix map mistreated as array. Fix #24