Fixed binding issues.