Non-linear propagation of long Rossby waves