#11 effectivity_fix