Another bugfix

Change-Id: I11bc92b375a28971e176f96ffa1f89bbae541f38