Made recorder more robust