BUG 2245 - Fixed Loose coupling

Change-Id: I0328d47b3817b4c8aa1f64e81b1e1aea304e97c0
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>