attempt at a fix for #81