[General] Fixed #362