partial fix of countdown