this fix issue #40