tony's bug fixed