fixes after revert