Some updates for issue #129