Minor security improvement