One more fix for #22