Fixes Bug #1985

Change-Id: I615702381c59d936733d964fc6287f78c2704a60