fix for #137