fixing bugs related to future handling