Fix return
Fix list