Issue #179 map collection fix