soa.nguyen Fix bugs