Fixes 583

Fixes #583

Signed-off-by: jdarwood007