Fix the previous fix, sigh