FIX: properly rebase