This commit implements suggested in fix #120