Fix other return bug