Additioal fix for previous commit for the active state