possible fix for #516