Fixes bug 1517

Change-Id: I968b0c79c712e8b845cf285279d9183363410a71
Signed-off-by: beierlm <mark.beierl@canonical.com>