fixed dumb logic...