Issue raised to track improving this in future