[General] Resolved #358