Fix issue #402