Fixed issues after revert