Duration fix, again