fixed for catching date issue