[Feature] close Ticket #1