[General] Resolved #359