Fixed duration issues