cleanup the fix for issue349
2 files changed