improvements for issue #575