Aaaand hotfix for previous bugfix