fix dates bug
merge