Bug-1741: Fix read/write operations

Change-Id: I77c6ddef5ce38a8284eaa8f39a04cac9eda90a10
Signed-off-by: Milos Fabian <milfabia@cisco.com>