[General] Fixed #361