fixed elseif instrumentation