issue #10 fix/hack.