Yet another bugfix...