Fix issue causing data drop during push on the lowend devices

Fix issue causing data drop during push on the lowend devices #44