fixed issues introduced by rebasing