In response to issue 588