Fixed to support version 2.