Fixed wrong return
Updated