Fix for issue #909 pull request

all tasks completed