bug fix regarding locked bindings
Merge branch '31-cleanup' into 32