#182 more smooth prev/next behaviour