fix moment creation