last bit of issue #248