additional fixes for issue #11