Fix modifier duplication