fix logic 2