Deadline tuning thanks to DerTeufel

Change-Id: Ieed33a2ab7f0481d1657df723b68640627e88095