Continuation of #328: Grrr....