General bugfix

Change-Id: I0ec0f693507a080c7ec845095545cfef64fa20f4