Fix listHandler()