fix logic
fix logic