finally fixed issue 17