fix for 5351 and 5352

Signed-off-by: daniel@efficio.us.com <daniel@efficio.us.com>