Duration option bug fix (hopefully)