[#391][#392] Done

Done both issues here
@Lynngre cna you check please