changed by Eduardo Cao in 12.19