bug fixed xD