partially fix issue 602
2 files changed