Readd previous condition

Backwards Compatibility