Bugfix - entity is being set to newFeature not feature. Threw exception on feature...