Fixed compatibility to new futures