Fix Gotoh stuff