Task 2 from issue #909 list completed
final fix for issue #909