Fixing dates calculation