Fixed some return error wrongly positive