Fixed saving Entry bug