Report and fix #167 and #166