Fix weird behaviour with non-exists fields