Fix auto binding