[General] Fixed #373