use datespan decorator; fix bug