Fixed template to handle future correctly