one grand commit to fix them all

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>