Rosa Bug, Task #117

Change-Id: Ibd4eb5456321a99c8ab0da5e314921aa61d1d07e
Signed-off-by: Stephan <stegiemail-github@yahoo.de>