Fixes auto-bind behaviour (bug #187)