further fixes for issue #2.