issue #68
make more robust