experimental fix, not sure if this breaks anything