[General] Fixed #356