[General] Resolved #350