fixed issue 34