Duration workaround implemented