Duration nil bug fix