partially fix issue #415