fixed take into account the current time zone for the postgresql