Fix for supporting http work mode