#267 - fixing regressions