check in fix for #586