Hot fix for shotgun

Change-Id: Id4990dfc7cccb909801e5b3d277d3f2002e1d6f2