One more fix for #11