closes 588