And one more related bugfix