fix all cases, not it works correct