Fixes 583

Signed-off-by: jdarwood007 <github2@sleepycode.com>
Merge pull request #585 from jdarwood007/fixes-583

Fixes 583