fixed highwater date to handle different dates