Fixed: #18 Entity props are cleared from map