Fixes previous commit which wasn't actually working