Minor tweak to ensure MSM compatibility