issue 647**