Fix next month calculation