issue #278 fixed