fix dates generation