fixed issues from rebase