Another Bug Fix

Change-Id: Ia7037a41233fa3f9df370491e92c68fc33941487