fix for very bad conditional