Example of a fix for #81