Bug fixes

FIXED: Minor bug in the list handler.