Fix Rebasing causes error #8