Fix #570
Use binding middleware
Fix #572