Fix the previous commit

The previous commit fixed the issue only for RPC_OUT_DATA requests.

Fixes #6