Fixed saving event to index it correctly #132