Fix for #2000

Change-Id: I6fc739c689dc5be336e8703898e7c6be06d6c1e5