Fix bug in this first version.