bug/204/state-manager-layer-check