fixed issue 15