Fix Future issue