[General] Fixed #354