issues 166 and 167 added