Try to fix issue #3 (I sill cannot reproduce it)