fix pr589