Plugging small security loophole