fix for issue #143

this fix the issue without lost performance.