One more fix of resource saving