Fixed return zero issue