followup bf74241 (fix #18)
modifications