fix as per comments in #146

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