Quick fix, will squash later