fixes for issue 75

fixes for issue #75