Bugfix

Change-Id: Ifa4749cf41e4a78cf7cbdf307334dce651ad36c1