Selected Task fix