prepare fix for #87