issue-#37-fix_23-Jan_31-15_36

