ty fixed some bug