Fixed $dirty/$pristine