Expanded experimental fix