Fixed some bug still NOT WORKS