fix #69 + test