Aaaand another fix, hopefully the last