Fixed: bugs in weektable