Yet another fix from before