fixing issues with tiem stamps