Fixed Maintenance-Bug

Change-Id: I8b35d5050bbbf6352601973ecbeb2464eb33ddbb