List modifications added by #158