Issue 350 - Go 1.16 released (23)