Moving fix for #705 into humbucker
Fix for issue #754