fix date issue retry

attempt #2 and simpler