Updated for GO 1.3.1