Fixed another place affected by the bug