Hopefully last fix for #34