small improvements for issue #23