Fixed for GO 1.4
Merge