One more fix to saving Entry without bucket