Forgot to add this new code to the previous commit.