Made a mistake in conditional.  Fixed and separated out to two checks
Made a mistake in conditional.  Fixed and separated out to two checks

ossimlabs/ossim,ossimlabs/ossim,ossimlabs/ossim,ossimlabs/ossim