[General] Resolved #349