minor changes
Maybe fixed issue #143. Good hopes.....