revert of opposite management
Minor fix on return type