Enhance (my errornous) code ;)

Change-Id: I5be058627437d0e21e07eb769a686f03503e2a34