Fixed logging after rebase