Presumably this is covered by issue #225