Fixes for issue #129