improved module condition - issue #87