[Anton] Fixed bugs