[General] Fixed #355