Yet another fix for #228