Final (?) fix for #223