Added PR#2 to build, applied fix to all lists