fixes active dates bug
Merge branch 'develop'