issue21 update