Date wrapping now works