Issue #130 -- slightly odd rebase animation fixed