Update #4, fixes #4