Another bugfix. Oops.