some fine-tuning to oscam-9999