fixes #2432 Setting Time fields on Calendar are changing Date fields

Fixed the issue and committed code for review.