issue 531: possible fix