Update, closes #696