fixed issue 3 of old repository