Correct previous commit. Updates #8