fixed bug with world class