Fixed binding issue