fix builder to setup return code even if -i option is used