fixing broken if...