Fix set -e issue