Only handle remaining

Signed-off-by: Furquan Shaikh <furquan.m.shaikh@gmail.com>