fixed issue 35