Another bugfix commit.