Fixed bug in list.
Merge branch 'test' into dev