whoops! Forgot to move something over to the non-debug use-case