Try to fix issue #255