possible fix for #676