Fixed mapping to null element bug.