fix logic...