Further fix for #14
Further fix for #14