issue 531: possible fix
Merge branch 'issue531' into develop