Fix folds

Fix #648