Tested issue 89