fix for no data conditional