Fix for issues mmcguinn had with #606