Same Bug fix as previous

Same rules apply