- Some issue fixed for zadatech for now

Signed-off-by: mobinzk <mobin.zk@3men.co.uk>