fixes for non-regression