port fix for #15 to devel branch