stage fix
Refactored code relying on bind implementation details