Forgot a return statement. Revert templates as it's broken