Fixed redundant buffer rebind and replaced it with a state-machine improvement.