Improved debind handling
1.2.2