Adjust conditional for broken legacy case