Further fix for #69