Add check to avoid unbinding keys before binding takes place