Yet another fix