issue #276 fixed