Fixed binId issues