Fixed binding issues