Bug fix for List data type