this shoud fix issue #133