Implemented Mr.Logan's List fix.