adding fix for #87, closes #87