Fixing the previous fix :/