closes 587