Yet another bugfix. :)