issue558 - Resolved problem with storing Map with keys of Date type