Fixed #402