Fix null duration