Bug fix with secrets