Fixed shield always-on bug