NewYear bug fixed