Fixed date issue in the back-end