TOP bug fixed