0.83: per application states - initial wasn't fired fix