fix some issue to make better update from Kloxo official