issue #279 fixed