Tony fix bug