fixes for issue #100