Fix boolean logic...