Fix modifyDate logic
Merge commit '23fbbd9f58971dba14b5b6d372e9fbc0a21c972f'