Some changes in native part
fix