next try to fix.

Solution without any changing logic.