make swap more reasonable #197