Bug FIXED :D