fix for issue 531