Added more defence in secret