Joseph/multidate fix