Fix bug introduced by #87