finally fixed the lastbug