revert changes and fix role