fix for #197
merge