Another bugfix. One more test passing.