Merry Christmas, Happy New BUGS... just fixed!