Real fix to the bind / provider issue.