Fixed return bug