Added conditional on last line of setup inst