[General] Resolved #360