Tony fixed bug