Addressing issues srv/viso2#8, srv/viso2#9