Fixed potential binding issue