hopefully fixed date issue?