Forgot some code for previous commit