issue 2299 working