2,500 tonnes of oil on board; fire breaks out again on Wan Hai ship