Try some fix for #154.

Try to fix isuue #154