Issue #216

Trying to save the date correctly in the db