BS-6988
Fix binding