Partially fix issue #306
2 files changed